Don't crash on broken ClientMessage events. (#157056, Owen Taylor)

2004-11-01  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Don't crash on
	broken ClientMessage events.  (#157056, Owen Taylor)

diff --git a/ChangeLog b/ChangeLog
index 99908b58fae4816d3c9e9e0c6aada35bfe955816..e877e178ae4e30d8760e25035ab57f5670a15b45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-11-01  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Don't crash on
+       broken ClientMessage events.  (#157056, Owen Taylor)
+
        * gtk/gtkactiongroup.c (gtk_action_group_get_visible): Fix a typo in
        the docs.  (#157044, Masao Mutoh)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 99908b58fae4816d3c9e9e0c6aada35bfe955816..e877e178ae4e30d8760e25035ab57f5670a15b45 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-11-01  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Don't crash on
+       broken ClientMessage events.  (#157056, Owen Taylor)
+
        * gtk/gtkactiongroup.c (gtk_action_group_get_visible): Fix a typo in
        the docs.  (#157044, Masao Mutoh)
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 99908b58fae4816d3c9e9e0c6aada35bfe955816..e877e178ae4e30d8760e25035ab57f5670a15b45 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-11-01  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Don't crash on
+       broken ClientMessage events.  (#157056, Owen Taylor)
+
        * gtk/gtkactiongroup.c (gtk_action_group_get_visible): Fix a typo in
        the docs.  (#157044, Masao Mutoh)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 99908b58fae4816d3c9e9e0c6aada35bfe955816..e877e178ae4e30d8760e25035ab57f5670a15b45 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-11-01  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkevents-x11.c (gdk_wm_protocols_filter): Don't crash on
+       broken ClientMessage events.  (#157056, Owen Taylor)
+
        * gtk/gtkactiongroup.c (gtk_action_group_get_visible): Fix a typo in
        the docs.  (#157044, Masao Mutoh)
 

diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 56dd4451f2c8242b6dc6ec93456d54f43d9f66de..e133f938d587cde33d94cf2a28fd641c535cc8c3 100644 (file)
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -2039,8 +2039,14 @@ gdk_wm_protocols_filter (GdkXEvent *xev,
 {
   XEvent *xevent = (XEvent *)xev;
   GdkWindow *win = event->any.window;
-  GdkDisplay *display = GDK_WINDOW_DISPLAY (win);
-  Atom atom = (Atom)xevent->xclient.data.l[0];
+  GdkDisplay *display;
+  Atom atom;
+
+  if (!win)
+      return GDK_FILTER_REMOVE;    
+
+  display = GDK_WINDOW_DISPLAY (win);
+  atom = (Atom)xevent->xclient.data.l[0];
 
   if (atom == gdk_x11_get_xatom_by_name_for_display (display, "WM_DELETE_WINDOW"))
     {